Fixed bug in use of scale in Unit; added test with hour & min units