Changed tests over. Still need to fix.