Added assert messages
More tests