tests passing with fix to two deprecated functions