More tests passing; deleted unnecessary code