Test updates minor bug fixes 6/18