ticket:4 New test; minor fixes