More standard unit tests working