MInor test tuneup