remove spinner for now, we have to find better solution for it
use correct this
looks like it needs a class name here
fix tests