Working on unit tests...