Fix passing tests