Fix CS issues
Cleanup tests