Update testing framework

Tests that aren't passing are x'd out.