Edited tests a bit, 1/3 still failing