Adding some tests...