significant changes to first test