simplify bootstrap
fix class name
first useful tests