Clean up tests
More consistent internal representation of components