Added some tests and more fixtures.