fixed bookmark builder test; optimized imports