Remaining classes added
Tests updated