Adding unit tests; minor enhancements; added constants