improved tests, fixed file paths to catroid