changed tests to use new classes in solitair cipher