rebuilt the first test, less calls from test page, more in steps