Refactor more setup methods
Refactor tests to be more explicit
Reorganize tests and factor out spec_helper