modifications
modified
name change
renamed
proper name change
name change on tests
some cleanup and annotations for andreas
refactored tests... make them shorter by using setUp
Merge pull request #2 from miclovich/master

Some changes to files