Cleaned up /usr, added test file