Re-enabled other tests and fixed up bugs