Feature/128 tests