passing tests and reorganization
added test spec