Added test plan & cases, plus extra credit