Forgot to remove require statements for dollar and franc, removed some redundant tests