Add Working Tests