Feature/better tests