Added unit testing!