start fixing testing