Added up/down unittests
Found the bug!