Improved testing
CS fixes