First hints on unit testing
Applied changes to test suite
Fixed unit tests