Added tests and stuff.