Tests working properly now