Issue/178 fixture scope

Convert to using a stack for test scope storage.

See individual commits for details