Get couple more tests passing