Add first version of tests
Merge remote-tracking branch 'dagadas/dev' into dev
Fix slots