refactored foo and fooTest
push/pull fast/forward problems..
push/pull fast/forward problems..