Feature/tests utils

See #313