test and classes improved