Adding some basic test controls