Better variable names
More tests