removed test main and comments
merged things