cleanup and updated unitTest