Some tests. Some small fixes
Something changed