Updates to Goldspot Tester App. Z