Fixed two errors in testing, 2 failures, still managing