added goalTest
fix merge conflict