removed semicolons
removed terst, replaced with assert