Feature/remove unit tests