Remake tests to work