Added test
Made awesome changes
Create/delete works