Fixed some tests to reflect changes to app