Moved test to the right location
Added some tests
Added tests for tasks, beautified existing ones