Update some tests to increase coverage and fix some stuff.