simulation fixed + added tests