added test to non locomotive first