rewrite tests - using correct assert methods