Fix test setup. Everything passing