Fix tests, add discussion test

@jinpa mind reviewing these? Thanks!