Fix little bug. Beef up tests