more testing additions and changes