New tests and fixed some todos