Added ByteSize.
Tighten up the tests.