Updated sandbox and tests