Fix Tests, Remove warnings