Started to add unittests