Modified tests to get them all passing