STI - clean test pass

This probably still needs work... but it's a start...