adjusted and optimised Locomotive and added new tests