Minor bug fixes on testinstanz