Added some tests, got rid of ID