added disabled tests. fix tests