Add testing directory
fix integration problems