More small changes/tests