Cleaned up some tests and made them work for firefox