Remove test code & Add definitions