Started implementing tests take 2