made target function more stable, put tests together in less files, made some adjustments to 2D movie