Update Tests and fix view