Unignore tests, a few tweaks here and there