Changeset 18

Added Swithes to Unit Tester