CS fixes
Added more unit tests classes