Just moving some tests aroudn to make it easier to see what's going on