Removed done TODOs
CS
CS
CS
Added three fixtures classes