Added a few tests?