Add facade and fix bugs
Fix tests