Completed unit tests for scaffolding and split utils into a separate module