Added first unit tests and some more