consolidated tests and added skip live tests