Added another quantity measurement scale and tests

Merge this dude