fixTests
slight enginery executable refactoring