Refactored simulation tests