fix test
fix test
bugfix
better status management (since the current scheme seems not to work on ET o_O)