More consistent naming
Make tests more complete