Moved tests into correct spot