Enabled some tests that worked, minor fixes