Fixed tests, now 100% perfect-a-mundo!