FIX: last test. all tests passing