added few sample tests
made tasks more elegant