Issue 28

Move these to setUp