I forgot to add the test source in the last commit. Here it goes with some more tests