Tests added for StockVial
Test clean-up optimized