Fixed tests and added a few multiline tests