test framework
fixed merge conflicts