WEBCMS-72 - Basic Unit Tests

Created basic Unit tests.  fixed a few issues.