Added unit testing stuff