fixes for sandbox and a better test group