Cleanup work around tests and readme