Fixed up some more system tests