Debugged and collated junit tests
Merge pull request #192 from andhieka/working

Debugged and collated junit tests