Messing around with tests, made theme compatible and so on