Added unit testing facility