Test Fixes, removed incomplete tests