switched to expectations from core.test
refined expectation syntax