Moved tests into subdir
More tests migrated