Added unit testing
Task is now written in Swift