Updated cuccumber tests and made changes to support testing.