also fix test suite to actually run the tests original commit: 84f98f62119e712d0b73f3480fd02a2208462dcc