Minor fixes, updated tests