Updated APIIntrepreter class and unit tests