Added test

Added multiline test,
code clean up
code clean up