reverted last commit changes, added generic test file, and reopened #14