style correction and test separation
Merge pull request #17 from sealocal/test

style correction and test separation