Adds tests for valid units; updates unit list