Various tweaks
Use ava for testing