added extra tests and support for temp instance store