Clean-up test & rename README