We need some unit tests...