GBE-467: refactored to extra TmsController + added unit test