Added weight, corrected issues with sleep, improved tests