moar testz
further test fixes
indentation fix