Tests and minor meta changes