Feature/moar tests