Added some more tests and sorta finished going through the online website on expectations