added test cases. simulator should be perfect now