Minor style updates
Fix tests
v0.3.1