basic test framework setup
fixed merging problems