additional unit tests, com css cleanup and housekeeping