Feature/write more tests