#1252 Reenabled unit tests