Issue 47 cleanup bats tests