small changes, added test files