Added better comments and more test files