Fix testing bugs

All test should be passing now.