Changed some == assertions between strings to .equals() instead.