Update tests to remove waste, rename template
Add type checking to Units