Revamped tests and updated example and README