Moved tests into proper directory to fit their namespaces