Continued test updates

Don't merge yet