reenabled some tests + added moq