Feature/40 assert builder