#29: Enhance unit testing up to 85%