Misc updates to test