Finish code for testing