- Removing some sync blocks which imho are not needed anymore. - Adding some smoke tests. - Relates to #364