Modified tests to work with specification samples