adding test folder, before merging in final version