fixed more deprecated stuff and tests passing with testthyme macro