Cleaned up some tests ( now 0 failures).