Rationalise variable names + add some more tests