added some spec testing
Merge branch 'master' into level7_start to add spec testing