Merge pull request #5 from jv217/master

Too many tests together. Can't select just few commits to merge. Merging it all now.
Moved it to the right place