bug fixing and testproject expansion