Re-organizes units and adds Volatile test
lowercase unit names