Adds tests and stuff