Update tests to use STI