Added stock class + test