[fix] unit tests work - refactored them