Fix tests and enabled running tests again