Moved test files to same directory, code style fixes
adding back test files after move