Updated codebreaker and added tests