@anthony-tarantini - fixing tests