improve tests..