More tests and stuff. Still WIP :(