Cleaned up MiyagiKeyCard class and tests