edited tests to get them all to pass