Feature/issue more tests