Work towards more tests passing
Make moar tests pass
Remove test skip