Fixed deprecated warnings and bad test data

This requires #65 to be merged first.