minor fixes and simple test