Fix issues of first real life test, minor fixes