Remove all warnings; All tests working again