Added dummy object to machine for now
Tests to cover current implementations, many small code alterations to fix for testing.