Changed include guard names :-)
Modified library API; changed the tests to reflect the new one.