Topics/tests and smallfix