Cleaned up Home test