bug fixes for first test