Organises functions a bit
Changes test notes