added method dictionary tests, cleaned up method dictionary code