Added Lisa Stephens' TestFirst solutions
merge'