Make tests

Add more tests. Most are broken due to #782 . This will help dev to figure out how to fix those issues.

Remove conflict