Updated default unit tests