Moar tests
fixes for some stuff