Strengthen tests and clean up
Use branch convention
Update README