Tests, Fixes