Improved testing--all tests passing right now. More to be added once login is fixed.