updated tests to get them to pass