moved test files in test folder, adjusted markup