Adding tests and todos