Refactor - use test word instead of spec inside of all classes