test: Added more fine-grained unit tests