Add solution for challenge 18, simplify the aes oracle wrapper class