Updated test and compile class