removed BDD marker comments
code formatting
fixed junit haystack-assertion
code formatting