Update unit tests and fix silly mistake