Continued test improvements