Removed test files and consolidated branches

New branch: Development