Merge "GlopBuilder, and test app refactor"