Removed everything
Added test