Clean-up of test files, writing down further todo's for unit testing