Glue test refactor and content view integration tests