class functionality fixed
new tests added