Fixed tests. Removed incorrect validation