Remove un-needed spec
Refactor tests into separate files