fixing after a bad merge i hope
get tests to run again