Updates Tests, Fixes Warnings