Change reciever names, add some tests