Test app tidy

removing non add-on specific guff