Readd some tests that were hiding fails