Made more changes to test and implementation process.