Updates the tests a bit and changes the code method names to match quite similarly to the php library