Tests working now