Fix tests and behavior

12 jobs for improve-build-setup in 27 minutes and 59 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #12047
conda-linux
build_linux_27

00:01:12

passed #12048
conda-linux
build_linux_34

00:01:18

passed #12049
conda-linux
build_linux_35

00:01:20

passed #12050
conda-macosx
build_macosx_27

00:05:17

passed #12051
conda-macosx
build_macosx_34

00:03:19

passed #12052
conda-macosx
build_macosx_35

00:03:26

 
  Test
passed #12053
conda-linux
test_linux_27

00:01:18

91.0%
passed #12054
conda-linux
test_linux_34

00:01:18

91.0%
passed #12055
conda-linux
test_linux_35

00:01:22

91.0%
passed #12056
conda-macosx
test_macosx_27

00:02:54

96.0%
passed #12057
conda-macosx
test_macosx_34

00:02:43

96.0%
passed #12058
conda-macosx
test_macosx_35

00:02:32

96.0%