Endure tests. Fixes