Tmss code cleanup part 4

Reinder Kraaijrequested to merge
TMSS-Code-Cleanup-Part-4-Front-End-Only into master

This Cleans up the code a bit and adjusts some unit tests

Merge request reports