move bugfix, move test