added test and some missing files in last commit