prettifications and updated tests