Expanded test and done fixes