UnitTests refactored

Major UnitTests refactored,
Minor naming enhancements
UnitTests Fixup
Merge pull request #28 from GrafSeismo/master

In good tradition - a daily patch :)