Added unit testing; packaged module