Re-organize specs/tests