moved tests to spec file, solved p4
Solved 5 and 6
Merge pull request #3 from alosada/working_branch

Working branch