Fixed some problems in test classes