cleanup on usable raw input files ans organise into test cases