Updates Tests, Fixes Bug