Test rewrite

Signed-off-by: Nick Vilensky <nick.vil.sia@gmail.com>