Week3b

using macros to refactor spec
add two feature tests