Fixed multiple tests, added additional post-bonus function tests