typo and test class structure fixes

1. Fixed typo
2. Change test classes structure to comply the following pattern
[ClassUnderTestName]_Spec->[MethodUnderName]_Test->Should_[be in some
state]_[after/before/when]_[action takes place]