Shallow interface moved to seperate file, test cleaned up.