Tests, more fixes, david and travis badges