Adding tests and stuff