Added test framework
Fixed merge