2nd test level and some bugs