Reogarnize tests & add norms tests & correct norms