Added waterline. Upgraded tests