Fixed task class and filled in all tests