contract rename
contract rename
move out simple tests
more movin