added two tests

added two tests
some cleaning