Update test descriptors to remove unnecessary 'should' language
Refactor tests into separate files