Cleaned up assertions and started on last test