Adding more tests and playing around.