Rework/update unit tests