Feature/more tests

More tests