moar tests & comments