Created the class and took out the skips in test
Resolved merge conflict