Cleaned up tests. Adding API testing