Extended tests for different stock types.
Tidied up from debugging.