integrated test changes to 'real' classes