Adds new test, organizes options a bit better