Maor tests, new API, shit and stuff