Made tests less macro-heavy; fixed typo in definition of Picometers