Feature/fix unit tests