fixing tests and knocking out todos