Added stack collection. Wrapped static creation in tests.