Spruce up the raw unit tests