Cleaned up methods and tests to pass cane test