New fixtures script, various bug fixes and more tests.