Add more stuff, real tests etc