tests added, created new classes