Bugfix and testing arena