Split test modules and added sample tests for Util