Tests are failing for some strange reason
Minor fixes