fixed tests, fixed folder structure