Tests are fixed now