Added a couple more simulator tests