removed Stocks class; refactored Stock and EntityTest