Refs #140 | Alignment and remove unneeded test