move testing code to another folder
minor changes