Added a few tests and extended one of the testing methids