moar work trying to get tests working