Fixed: [#6] Add Test classes