Include classes in the test, not the bootstrap
Reworked weight class (now based on SI units) and added unit tests